#247: #106: outstanding issues resolved

opened by njr2128