Script integration and fixes;