Pretty up the start and finish a bit for the demo