more formatting and other fixes