tweaks and improvements to yaml layout