some random fixes

stuff was added
Merge branch 'Gear-Work'