Added scanner, option to preserve dashes and more