tools updated
Final commit on this fork