improvements for tools