fixed some bugs and added user parts
Fixed event subscribing