Organization, small python changes, c addition