Fixed some of the server side generation stuff.
Continued to improve server side generation and sync