add polymorphic comments
fixed some tests