Minor adjustment to key mappings and file location