There are a few more comments and error fixed.
I tested the measure configuration process and it works well.