[TW289] - Core/Scripts: Clean ups and reverts and adds a missing event.....

....

after checking some videos...