CLEANED-UP: templates are much easier to read now
ADDED: WAK8 compatibility fixes