Removed the --date and --timeout command
Added some feature ideas