fixed up a lot of shit. we probably lost some work...