Script Improvements

Updates dependent scripts, improves conditional loading