Updated the specification.
Tweak minor stuff in Util.h