Big update(0.2): cleaned the mess