e01m01 tweaks
Merge branch 'master' of github.com:s3a/butcher
e01m01 tweaks