Fix some stuff and bump version to 0.0.2