Extended user interface and added some new options.