new fixes
stuff