adding util
cleaning up..
small fixes