Report formatting fixes (I think I'm done)