#1 - Minor fixes and improvements.