It may be worth getting something like TurboTax for next time- Anna can sing it's praises better than I can. because I've only used their online version for my individual taxes last year. It was nice, though, because it would take you to the worksheets for the forms to figure out what the baseline number is for your one page form. And keep track of it all.

My dad, who is one of those people who (and no, I don't get this either) *enjoys* doing his taxes (the doing, not the paying), also loves TurboTax.