some minor fixes and improvements [1.1.5]