keybug/templates

removed a bug with multiple keys
some template changes