used shorter event construction in most places
Merge branch 'master' of github.com:brainpower/Maximum-Fish