more fixes
misc