Changed a LOT of things and some script changes