nicer
ordering and fix
Merge branch 'master' of github.com:KnightsOfTheComputerTable/celis