massive changes, templating, hyphenation & experiments