Various tweaks
Merge branch 'master' of https://github.com/worzy/crucible