Some fixes: nullpointer, comments, using UserInfo.equals