Minor changes working on v0.0.2