small bug fixes
bug fixes plus liz style
things and stuff
Merge branch 'master' of https://github.com/mccormickt12/Ideas