Hi Andrew, This serial was couple fixes by me recently. As there were some discussion of them. I post the latest here with all concern addressed and reviewed-by added, for you easy to merge. Please review. Thanks, Junxiao.