upgraded submods. various changes.