various improvements - added find/replace