Problem:    Small mistakes in comments, proto and indent.
Solution:   Fix the mistakes.

Also update runtime files