Overdue checkin, random fixes, plus synchronize tests