Update options and add some useful mappings