Minor fixes and improvements for v1.0.1