Added: Swimming stuff
Added: Remotes, corrected typos
Merge pull request #6 from schwindp/master

Some last-minute additions