- attempt to fix focusing bug
- attempt to fix an exception when there is faulty ShellNamespaceExtensions
- small cleanup