Updated the UP, tweaking the tools a bit