Got all curl calls working
Did some script cleanup