Better connection info handling. Adding images.