minor fixes and styling