submods and minor script changes.