Final bugfixes, next merge.