Semantics and comments improvements.