fixed some bugs and added user parts