Restored to commit 6a137cb and added stderr prompts at key spots