Rework cmdline handling, supporting some variables via cmdline now