Fixed Duplicate Scripts
more fixes