sync, more bug fixes