Fix cha
Some tweakings for v0.1