fixed second fish error, cleaned up code
More cleanup, separated fishing functions to new file.
Removed duplication.