Improvements to Push Server draft 

As discussed on the mailing list.