Small tweaks and improvements.