revmoed .yml and fixed header logic