some basic fixes
Merge pull request #1 from Buildstarted/master

some basic fixes