private keys without master keys and some fixes for things which broke along the way