sync; various fixes (node mode, manual etc.)