swap tweaks
swap tweaks
swap tweaks
swap tweaks
fixed swap problem
Merge branch 'unstable'