75% done cleaning up and adding comments in (non-test) code.