bug fixes and styling changes