Fixes in terminal: double keys, not solved yet