Prompt fixups mostly
Merge branch 'master' of github.com:kcrca/kcrca