Added command line arguments to disable/enable features for debug testing