Finished util, shored up some other things.