started cleanup
couple fixes for OS1
Merge pull request #5 from Zuhkov/master

Start of cleanup plus a couple OS1 fixes