Fishing Trait Improvements

Merged the latest commits to my fork before updating, so that's why previous commits are showing up. Upon being merged Github will recognize that mine is the only one that has changed.