alignment better
cohesion sort of working
Merge branch 'master' of https://github.com/temclaugh/fish-schooling