Minor changes (e.g. PROMPT name); JavaDoc and logging update