Update README and a few small fixes to the util.