Added the functionality to reenter password to ensure you entered what you mean. Cleaned up a bit more.