removed comments from code blocks, carls changes incorporated, some of owens