Minor fixes
Cleanup of scheme parts
Fixes a few crashes at exit()
Merge branch 'master' of github.com:dleslie/whittle-engine