Privsep fixcons

New stuff from december 18th, compared to the master_remote branch. Everything that was in that branch is also in this branch.