Tests; tweaks; bugfixes.
Removed swap files