comments, and a wide variety of String cleanups (mostly surrounding Search/Match etc)