Revert "fixed some more things"
Merge pull request #2 from hellotj/revert-1-better

Revert "fixed some more things"