Added userLogin class and other minor changes