finally proper treatment of NA and Inf and docu added