[0.9.4-dev] many changes & fixes