diff --git a/docs/index.html b/docs/index.html
index 14010a1e1..31bfbeac9 100755
--- a/docs/index.html
+++ b/docs/index.html
@@ -155,9 +155,8 @@ structure in the torrent-file.
 
 <p>
 <tt>fingerprint</tt> is a short string that will be used in the peer_id to
-identify the client. If you want your fingerprint to be shorter than 4
-characters, you can terminate the string with a null. The default is an
-empty string.
+identify the client. If the string is longer than 7 characters it will
+be trimmed down to 7 characters. The default is an empty string.
 </p>
 
 <p>
@@ -442,11 +441,11 @@ piece and <tt>info_hash()</tt> returns the 20-bytes sha1-hash for the info-secti
 torrent file. For more information on the <tt>sha1_hash</tt>, see the <a href="#big_number">big_number</a> class.
 </p>
 
-<h2><a name="torrent_handle"></a>torrent_hande</h2>
+<h2><a name="torrent_handle"></a>torrent_handle</h2>
 
 <p>
 You will usually have to store your <tt>torrent_handle</tt>s somewhere, since it's the
-object thought which you retrieve infromation about the torrent and aborts the torrent.
+object through which you retrieve infromation about the torrent and aborts the torrent.
 Its declaration looks like this:
 </p>
 
diff --git a/include/libtorrent/session.hpp b/include/libtorrent/session.hpp
index 996366a9f..5070ef3f8 100755
--- a/include/libtorrent/session.hpp
+++ b/include/libtorrent/session.hpp
@@ -97,12 +97,12 @@ namespace libtorrent
 			// is filled in by storage::initialize_pieces()
 			// and represents the progress. It should be a
 			// value in the range [0, 1]
-			float progress;
+			volatile float progress;
 
 			// abort defaults to false and is typically
 			// filled in by torrent_handle when the user
 			// aborts the torrent
-			bool abort;
+			volatile bool abort;
 		};
 
 		struct checker_impl: boost::noncopyable
@@ -158,7 +158,7 @@ namespace libtorrent
 			// the settings for the client
 			http_settings m_settings;
 
-			bool m_abort;
+			volatile bool m_abort;
 			
 #if defined(TORRENT_VERBOSE_LOGGING)
 			boost::shared_ptr<logger> create_log(std::string name)