Most 0.1.12 bugs fixed