major progress on comments