some more formatting fixes