fixed ordering and invalid yaml