Livesync fixes and improvements
Merge pull request #446 from Icenium/fatme/livesync

Livesync fixes and improvements