tweaks and improvements...