fixing arguments and some of the bits for the exec script...