fixing EVERYTHING