More commandline tweaking