Fixed a bug with multiple buttons in switch controls: removed this.switchControls declaration and initialization from the Engine() class - these should be private to each engine. Added lazy initialization to Engine.addSwitchControl. Also removed this.container initialization - it is initialized silently in MapWrapper and passed to *Engine.initialize as a parameter: an Engine implementator doesn't need to know about this field anymore