minor bugfixes
Merge pull request #1 from mancdaz/master

minor bugfixes