Added command-line options to control some experimental features