Add control p. Minor tweaks here and there.