r13975
some corrections