fix some more things
Merge pull request #8 from legoktm/something

fix some more things