added mappings
fixed ctrl-z