minor bug fixes and styling