fix ssh_config as well, simplify some ifs