Updates completed from comment feedback addressing issues #19,#20,#22, and #23