@timgraham  Ok that is also done. I think now the PR is good.