bugfix options parameter detection + improve command history