updating towards danvk/master: completed all