file: protocol enhanced & bugfix