(v.0.5.0.4) several small fixes