Several improvements in design.