Tax preparation fees, does this include both federal and state fees paid?

Yes, you can deduct the fees you paid to have any income tax return prepared.