defere the warmup flag
clean up comments
clean up and bug fix