small fix + work on yield calc