#44 Consolidate templates, fix macro, fix misc bugs