clip-execute bugfix and minor changes