more formatting and minor fixes