completed plan, added comments to yoneda
comments
comments in equivalences