changed header around some and comments should match with block comments in source.