Refactor some
Command Dash without arguments runs for <word>
Update mappings