more fixes
v0.2b4