update some comments and a var name