Make ctrl-a and ctrl-e work and fix comment