add UserKeeper class; some minor fixes