The new Flickr Uploadr has been built from scratch to work on Windows and Mac OSX. Before you upload you can add titles, tags and descriptions, add stuff to sets and reorder things directly in the Uploadr. This is an open source project, too, so you can download it and have a look at how it works.