#108 - Minor fixes and improvements.