Some more refactoring + argv[1] config specifying support