Add a bit more on public-key. Random fixes