Cleaned up a couple issues with the color being wrong or hard to read.  Also fixed printing issues with the password.