more bug fixes and styling changes