fixes with commandline arguments & better integration