More tool mode improvements