fixed a bunch of S#*t