Fixed some bugs and filled in user dto