redid a bunch of formatting
tests all pass