Added more tool mode things to do