Mercury tool bug fixes and UI update.