Upload & Sell: Off
Years ago when I wanted a better photo editing and cataloging solution I was confused about what to get. Here's what I decided on and I've been very happy with my choice.
I got Lightroom for photo cataloging, importing, etc. It can do quite a bit of editing also, but it has limitations. I also have Elements which is great for more extended editing like merging photos, taking a person out of a photo, making a collage, etc. The two complement each other very well.