Minor corrections to improve interface

Several minor corrections to improve user interface.