Tried to fix some bugs on the server by not having default values