Removed __add__, as arithmetic not to be included in this PR
Fixed a few left over plural "units"
Removed a left-over `copy`, an unneeded import, and some PEP8 fixes