Fixes & sorting
Merge branch 'master' of github.com:cornedor/mayhem