excluding zip-files and few fixes