Fixing some comments, renaming some variables.