Pushing some changes from my branch manually

Tested it on mine, merging master to Ace not doing anything for some
reason, so I didn’t want to go the other way using github