update some commenting and control p