Several bugfixes done on the general Sync, and lots of improvements as well. Related with #11