Zander's Kickoff updates

Loads of small updates and improvements to Kickoff.