Simplified command line options and improved help