v.83.3 bugfixes, changes from main refocus