More logging and arg fixes