keybug/templatebugs

removed a bug with multiple keys
changed some templates