making some progress on polymorphic comments, down to 2 errors