better semantics
fixed some cruft
Merge branch 'master' of https://github.com/aaronlaursen/STUFFS