Added usage details and cleaned up command line read of username and password.
Cleaned up a bit
Cleaned up a bit
cleaned up