Cleaning up exceptions.
Renamed variables.
Fixed list cleaning, added tests.
Clean up varnames.