Fixes and fillers

fixes and fillers for 1.8.1
Merge pull request #8 from sukar42/1.8

Fixes and fillers, 1.8