Added a few new options and mappings.