Refined a lot of code
Synced data client to server