better mode and NA handling