add polymorphic to comments
some litle changes