Photo organization

I spent today organizing all my digital pictures from 2009, weeding out the truly bad ones, and changing the file folder names to date plus general description instead of date alone. Then I pulled them all into Photoshop Elements and started tagging them with the Organizer. I feel vaguely dissatisfied. I really prefer the tagging method on Flickr, but when I tag with Flickr, the tags do not attach to the files on my computer, just to the uploaded files. If I use Elements, I can write the tags to the metadata of each file before uploading to Flickr and the tags will transfer as well. 'Tis a pickle.