min fixes
some fixes to lib
fixes
fixes
after merge