Fix a few bugs
Bump version to 0.0.2