better comments mainly
Merge branch 'tmp'

Conflicts:
	emr/flows.go