fixed a bunch of stuff, can't even remember exactly now