edits as rqst by sbarnum

@sbarnum - does this address your comments?