Closes #156. Hopefully fixes intermittent null ref
Closes #155 - hopfully a fix for various focus issues
Closes #152