Small fixes
Do not use 'prompt' in a non-emacs sense
ready for release 3.1