Legacy keyholders report and other fixes :-)

Merge in legacy keyholders report branch with a lot of other things added to it.