more todo fixes
more todo changes
Merge branch 'helpfile'

Conflicts:
	gemmquick dev.R