included util, minor changes