Updated script packages. Refactored here and there.