[0.9.4-dev] many fixes