a few more formatting fixes