improved formatting
password mismatch now prompts retry