Changed user form.  Other small updates