few minor tweaks
swap files