general fixes and styling