manifest generation, minor fixes