Minor improvements in the interface.