Cleaned up.  Password input working.