little improvements here and there
Merge pull request #38 from yetanotherhacker/littlefixes

little improvements here and there