Added mode selection, default mode setting, battery mode 2