Jim's comment is spot on! Definitely focusing on those things is of top importance since many times the organic play can push past the local one.
Something that might be helpful when it is time to clean up NAP is a YEXT package (if you don't already have one). The highest package is $499 per year, but definitely worth the hassle of trying to handle a good chunk of your citations across some of the main local sites. You can easily update the NAP in one place, then it will populate to all the directories in your particular package.
Here is a list of the directories in their network: http://www.yext.com/network/publisher-network
As a side note, one place you might be sure the NAP info is updated and that is not in the YEXT publisher network is YellowPages.com (YP).
I would also sign up for Moz Local ($49 per year) since they have a connection directly with the main data aggregators.
Best of luck!