Get focus to work again for the dual objective setup.
Update storm2 setup for XML hardware approach.