styles and minor fixes