more bug fixes and styling