different fixes and styling