fixes
misc