improve comments and also improve identifier recognition for variables