fixes
misc changes