small fixes and optimizations
Merge pull request #102 from udK/patch-1

small fixes and optimizations