Lots of changes that hadn't been reflected in Github