fixed a bunch of formatting things