Minor fixes, secondary location support, exchange tabs