more fixes
stuff