general fixes and prettification