Start to add line informations in instrumentation.

And fix some CS.