Added preliminary sync() support.
Minor fix
Updated TODOs