a lot of minor fixes + using 9.22 for lib