fixes and more comparations v0.0.2