min fixes
some fixes to lib
fixes
23.02
23.02
23.02
fixes
after merge