Lots of stupid changes to the master (production) branch