edit comments to generate annonated source code
merged now