ome fix and refactor
v 0.0.2