tweak make and run scripts to be a bit more flexible