various fixes
0.1.7