v0.2 (again)
cleaning up