3.0.9 updates

Final events templates, general bug fixes and improvements.

Signed-off-by: Luke Oatham <lukeoatham@gmail.com>