swim fixes
Merge branch 'master' of github.com:CLOUDS-Interactive-Documentary/CLOUDS