fixed more things
Merge pull request #9 from joejoejo/fixes

fixed more things