Cleanup & Lag fix test 1

Cleaned up the scripts tabs;
Testing lag fix