more fixes
v.03