yay fixed more things mostly formatty stuff