fix bunch of stuff