minor fixes + new tools