a bunch of formatting fixes