Save and load corrections as per Scott Purdy.

Moved wrapAround to the end in save and load methods in order to preserve
backwards compatibility.

Also reduced comments in CMakeLists.txt to 80 characters wide which makes
them easier to read in small windows.