Fixed stuff. Lots to fix still