* fixes and improvements.