fix everything (now working)