bug fixes and styling fixes