* Fixed sync engine so it works again.
* Also, slight code tweaks.