Minor code re-arrangements, access level fixes
Add focus property to Matrix