Folded in more commentary as comments to be addressed