Added external Tools. Minor changes