Further command line adjustments

Refined the command line syntax and provided additional logic as needed