fix yincart and add comments,