made modifications based on all the comments from last commit.  Also added soem default preferences for the user.