some minor enhancements
Merge pull request #1 from zeroed/master

just some minor enhancements