Updates

Changes to the tool, with a real view of what shipped.