Synchronize fish and disable serial requirement temporarily
Tidy up some little bugs and tweak constants
Merge branch 'features/synchronize-special-fish-with-their-school'