Development commit

Some language fixes and template merges