analysis updates - not all fixed