tons of formatting fixes