Add new tools

Minor bug fixes.