Renamed 'super' tables for consistency
Improve how script termination is handled