Script Fixes & Cleanup