small cleanup tweaks
Merge branch 'master' of github.com:Darzu/castle