Added additional funcs, fixed README and bugs