Improved documentation comments and measurement type related code.