Some code clean up.  Also now reads in all parameters (so login can be implemented - login is my next TODO)