little fixes here and there
Merge pull request #12 from yetanotherhacker/littlefixes

little fixes here and there