upd
sm. fixes and updates