Some utilities and documentation improvements

Hope these are helpful