formatting and minor fixes