Redid some changes earlier lost in git merges.

Removed some comments earlier removed by Nils.
Changed some variable names earlier changed by Nils.