Fixed stuff, but probably didn't fix stuff