more work on bundled cables - cleanups and trigger/action code