Availability metric added. Fixed method selection widget. Minor changes.