checked in a few more formatting fixes