New shapes from MC and minor bux fixed