Better variable name setup.

Plus a few other chafes.