added all options, removed subline