More content-tweaks and improvements.