finished greplace improvements