bugfix
compiles once more
only a few bugs left
tests pass!  (but that doesn't mean much)