cleaned stuff up (revert commit)

things actually work, seriously. Revert to these changes if we royally
screw up