#100 - Minor fixes and improvements.