Improved partial protocol implemnetation, fewer warnigs and more, 'getting there'