Correct some mistakes in logic and release 0.0.1a