When find/replace goes wild ...

- Bug fixes. Should be stable now.