better NA handling [issues 3 and 4