a bit more cleanup and a bug fix or two for the new private post security model