Code Cleanup, Bugfixes, & Fish Traps

I lied again. No plants here. But instead I added something useful! Fish
Traps! Probably the most useful thing I've added since Project Benches.