Fix some bugs and bump version to 0.1.2