diff --git a/Assets/Scripts/Crop.cs b/Assets/Scripts/Crop.cs
index 9f6ba4a..e2ccaa9 100644
--- a/Assets/Scripts/Crop.cs
+++ b/Assets/Scripts/Crop.cs
@@ -57,13 +57,13 @@ public class Crop {
     public void Clicked(UsableItem usableItem) {
         if(usableItem != null) {
             ItemContainer ic = ItemContainer.Instance;
-            if(ic.GetItemIdByName("Hoe") == usableItem.Id) {
+            if(ic.GetItemIdByName("Hoe") == usableItem.ID) {
                 ApplyAction(Hoe);
-            } else if(ic.GetItemIdByName("Scythe") == usableItem.Id) {
+            } else if(ic.GetItemIdByName("Scythe") == usableItem.ID) {
                 ApplyAction(Scythe);
-            } else if(ic.GetItemIdByName("Wheat Seeds") == usableItem.Id) {
+            } else if(ic.GetItemIdByName("Wheat Seeds") == usableItem.ID) {
                 ApplyAction(Seeds);
-            } else if(ic.GetItemIdByName("Watering Can") == usableItem.Id) {
+            } else if(ic.GetItemIdByName("Watering Can") == usableItem.ID) {
                 ApplyAction(WateringCan);
             }
         }
diff --git a/Assets/Scripts/FishingController.cs b/Assets/Scripts/FishingController.cs
index a7fcb1c..d4269f4 100644
--- a/Assets/Scripts/FishingController.cs
+++ b/Assets/Scripts/FishingController.cs
@@ -55,15 +55,15 @@ public class FishingController : MonoBehaviour {
                 }
             } else {
                 _fishingTime += Time.deltaTime;
-                //NotifyShake();
+                NotifyShake();
             }
         }
     }
 
     private void NotifyShake() {
         _exMark.transform.position =
-            new Vector3(_exMark.transform.position.x * _ampsXY.x * Time.deltaTime,
-                _exMark.transform.position.y * _ampsXY.y * Time.deltaTime,
+            new Vector3(_exMark.transform.position.x + _ampsXY.x * Time.deltaTime,
+                _exMark.transform.position.y + _ampsXY.y * Time.deltaTime,
                 transform.position.z);
         _ampsXY.x *= -1;
         _ampsXY.y *= -1;
@@ -100,7 +100,7 @@ public class FishingController : MonoBehaviour {
             Debug.Log("Tried to catch!");
             if (_fishingTime <= _maxTime) {
                 Debug.Log("Caught!");
-                Inventory.instance.AddItem(ItemContainer.Instance.GetItemByName("Fish"), (int)(3 / _fishingTime));
+                Inventory.instance.AddItem(ItemContainer.Instance.GetItemByName("Fish"), Math.Max((int)(1 / (_fishingTime/2)), 1));
                 ResetFishing();
             } else {
                 Debug.Log("Failed to catch!");
diff --git a/Assets/Scripts/Item.cs b/Assets/Scripts/Item.cs
index 5436219..0f96e79 100644
--- a/Assets/Scripts/Item.cs
+++ b/Assets/Scripts/Item.cs
@@ -10,7 +10,7 @@ public class Item : ScriptableObject, IComparable<Item> {
     public Sprite defaultSprite;
     public int price;
     public int SellPrice => Convert.ToInt32(price * 0.8);
-    public int Id => _id;
+    public int ID => _id;
 
     public Item(string displayName, string description, int id) {
         this.displayName = displayName;
diff --git a/Assets/Scripts/ItemContainer.cs b/Assets/Scripts/ItemContainer.cs
index 3664627..1ed56b2 100644
--- a/Assets/Scripts/ItemContainer.cs
+++ b/Assets/Scripts/ItemContainer.cs
@@ -48,6 +48,6 @@ public class ItemContainer : MonoBehaviour {
     }
     
     public int GetItemIdByName(String name) {
-        return GetItemByName(name).Id;
+        return GetItemByName(name).ID;
     }
 }
diff --git a/Assets/Scripts/Tiles/FarmlandTile.cs b/Assets/Scripts/Tiles/FarmlandTile.cs
index 29c8e9e..63524ef 100644
--- a/Assets/Scripts/Tiles/FarmlandTile.cs
+++ b/Assets/Scripts/Tiles/FarmlandTile.cs
@@ -23,7 +23,7 @@ namespace Tiles
             base.Clicked(usable);
             _crop.Clicked(usable);
 
-            if (ItemContainer.Instance.GetItemIdByName("Shovel") == usable.Id)
+            if (ItemContainer.Instance.GetItemIdByName("Shovel") == usable.ID)
             {
                 rv = new GrassTile(_gameObject);
             }
diff --git a/Assets/Scripts/Tiles/GrassTile.cs b/Assets/Scripts/Tiles/GrassTile.cs
index 156fce9..cfcbbb5 100644
--- a/Assets/Scripts/Tiles/GrassTile.cs
+++ b/Assets/Scripts/Tiles/GrassTile.cs
@@ -20,9 +20,9 @@ namespace Tiles
             if (usable != null)
             {
                 base.Clicked(usable);
-                if (usable.Id == ic.GetItemIdByName("Hoe")) {
+                if (usable.ID == ic.GetItemIdByName("Hoe")) {
                     rv = new FarmlandTile(_gameObject);
-                } else if (usable.Id == ic.GetItemIdByName("Shovel")) {
+                } else if (usable.ID == ic.GetItemIdByName("Shovel")) {
                     rv = new WaterTile(_gameObject);
                 }
             }
diff --git a/Assets/Scripts/Tiles/WaterTile.cs b/Assets/Scripts/Tiles/WaterTile.cs
index 467bbcf..35682e3 100644
--- a/Assets/Scripts/Tiles/WaterTile.cs
+++ b/Assets/Scripts/Tiles/WaterTile.cs
@@ -12,14 +12,14 @@ namespace Tiles {
 
             ItemContainer ic = ItemContainer.Instance;
 
-            if (usable.Id == ic.GetItemIdByName("Fishing Rod")) {
+            if (usable.ID == ic.GetItemIdByName("Fishing Rod")) {
                 FishingController fc = FishingController.instance;
                 if (!fc.Fishing) {
                     fc.StartFishing();
                 } else {
                     fc.TryCatch();
                 }
-            } else if (usable.Id == ic.GetItemIdByName("Shovel")) {
+            } else if (usable.ID == ic.GetItemIdByName("Shovel")) {
                 rv = new GrassTile(_gameObject);
             }