fix some small bugs. version 0.0.2. Still a very early prototype stage