l7 somehow correct results
l7 fixes & cmnts