misc updates
misc changes