Many Improvements.

Bug in Tools.pas