Further tweaks and improvements...