Cleanup, better scripts, version flag