various improvements
zip has server now, no need to rename