[0.9.4-dev] Some changes & fixes
[0.9.4-dev] remove idea
[0.9.4-dev] remove idea 2