updates
lots of improvements and cleanup
Merge branch 'master' of github.com:acidjazz/zach