added ctrl-p and more things