several fixes
v0.2b3