fixing a bunch of crap

yolo