Changed UserSerializer, hopefully fixed bugs, need to write unit tests