some minor fixes and style