various fixes
0.0.31