new fixes and stuff blahblah