cleaned up a little - more to follow

and also finally script and util integration