Minor tweaks and renamed the tool.