added smtps/imaps, cleaned up comments