Improved fishing system mechanics

Debating on how items are obtained though.