#31 - Minor fixes and improvements.