fixed all the things, hopefully