Some fun stuff and general fixes