fixes
updates from sanmiks project