rename/cleanup work 100%, added filenames on dashboard, removed some swps