a lot of syncwarrior bug fixes