Number of fixes for the demo t'row

Specifically relating to mating, event handling etc