Some comment and other stuff changed.