fixes/comments from Feng