Removing some extraneous commenting
Various updates, mostly untested
Merge branch 'cr/greenspec'