Added an auto tool utility and some minor tweaks