Further tweaks & improvements.