misc fixes
stuff