Minor tweaks and improvements.