Some cleaning and more POP connection text fixes