v.87.3 bugfixes, changes from main refocus