Some of Timo's suggestions as well as neighborhoods
Merge branch 'master' of https://github.com/erichare/pelica