fixed some more things
Merge pull request #1 from hellotj/better

fixed some more things