#93 - Minor fixes and improvements.