Some tweaks to make this lot work the way I thought it did in the first place!