more fixes
0.5.0