For #342 - several additions and corrections to address feedback from jashkenas