#100 #116 #117 Several issues addressed.