fixes and improvements...