Multiple fixes, templates, listeners, general eye candy