Bsongis/vario improvements