fix some bugs and replace users by me