@Peter Molenaar can you please review the comments on your pull requests.