Updated a bunch and added a tool