Some fixes I did while implementing this server.

Second attempt, found a bug.

 As header says. Commenting in patches is hopefully sufficient(?). Some examples of the group header output in #10. The "Modify group header to reflect snarfing." patch tries to address #12 in it's own way.

Most of these should be simple to rebase to current master, the exception being the two group header patches.