some small fixes and improvements