Add function to adjust age NAs; some code tweaking