correct FD calculations

include const model values
improve dealing with NA values