fixed some more build bugs
Tried to fix some bugs on the server by not having default values
Merge branch 'develop'