merged by chm, seems ok now