adding more proper control mappings