Even more improvements.
Changed some names.