enhance the wrapper and options + tool-dependency fixes