fixed diagram, added refenceing comments, more todo's fixed words