Fish Story: Bug fixes

Some bug fixes. Thanks to GENiEBEN for help with fixing achievement bug!