Updated various tools