misc fixes
misc fixes 2
misc fixes 3