random fixes
misc fixes