Clean up and add tags to everything.