Bug fixes and new tools