basic commandline handling added