Several corrections to improve interface.