diff --git a/examples/basic.rs b/examples/basic.rs
index df74eb9..53e7457 100644
--- a/examples/basic.rs
+++ b/examples/basic.rs
@@ -16,9 +16,9 @@ fn main() {
     let mut imap_session = match client.login("username", "password") {
         Ok(c) => c,
         Err((e, _unauth_client)) => {
-            println!("failed to login: {}", e);
+            eprintln!("failed to login: {}", e);
             return;
-        },
+        }
     };
 
     match imap_session.capabilities() {
diff --git a/src/lib.rs b/src/lib.rs
index a5ec0fb..553671b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -6,9 +6,8 @@
 //! See the `examples/` directory for more examples.
 //!
 //! ```no_run
-//! # extern crate imap;
+//! extern crate imap;
 //! extern crate native_tls;
-//! # use imap::client::Client;
 //!
 //! // To connect to the gmail IMAP server with this you will need to allow unsecure apps access.
 //! // See: https://support.google.com/accounts/answer/6010255?hl=en
@@ -18,11 +17,17 @@
 //!     let port = 993;
 //!     let socket_addr = (domain, port);
 //!     let ssl_connector = native_tls::TlsConnector::builder().build().unwrap();
-//!     let mut imap_socket = Client::secure_connect(socket_addr, domain, &ssl_connector).unwrap();
+//!     let client = imap::client::secure_connect(socket_addr, domain, &ssl_connector).unwrap();
 //!
-//!     imap_socket.login("username", "password").unwrap();
+//!     let mut imap_session = match client.login("username", "password") {
+//!         Ok(c) => c,
+//!         Err((e, _unauth_client)) => {
+//!             eprintln!("failed to login: {}", e);
+//!             return;
+//!         }
+//!     };
 //!
-//!     match imap_socket.capabilities() {
+//!     match imap_session.capabilities() {
 //!         Ok(capabilities) => {
 //!             for capability in capabilities.iter() {
 //!                 println!("{}", capability);
@@ -31,14 +36,14 @@
 //!         Err(e) => println!("Error parsing capabilities: {}", e),
 //!     };
 //!
-//!     match imap_socket.select("INBOX") {
+//!     match imap_session.select("INBOX") {
 //!         Ok(mailbox) => {
 //!             println!("{}", mailbox);
 //!         }
 //!         Err(e) => println!("Error selecting INBOX: {}", e),
 //!     };
 //!
-//!     match imap_socket.fetch("2", "body[text]") {
+//!     match imap_session.fetch("2", "body[text]") {
 //!         Ok(messages) => {
 //!             for message in messages.iter() {
 //!                 print!("{:?}", message);
@@ -47,7 +52,7 @@
 //!         Err(e) => println!("Error Fetching email 2: {}", e),
 //!     };
 //!
-//!     imap_socket.logout().unwrap();
+//!     imap_session.logout().unwrap();
 //! }
 //! ```