refactors, tests, v0.0.4