some fixes + __str__