change cmd line options to be more versatile