fixed account model; cleaned up user model