Some manifest improvements, still has to evolve