Included extra utils and corrected the yaml.php code.