Comment fixes, don't copy