implemented user model spec & minor fixes