tweaks; fixes; sync