Adding other forms to CUDA version, and command-line interpretation