old changes
misc fixes
misc fixes