Some improvements in design.