new tools, a lot of bugs fixed