fixed comp names and auto restart