Fix for some components, and explicit 2-space indentation.
Version++