0.0.1
fix some bugs introduced by re-org