reverted
misc fixes