Bug fixes. More tweaks and error trapping.
Merge pull request #109 from Cegaiel/master

Fishing Macro - Bug fixes. More tweaks and error trapping.