upload 11: minor changes suggested by zhongjie