As far as the chords, either a very exhaustive chord dictionary could help, or look at a book like the Fretboard Workbook:
http://www.amazon.com/books/dp/0634049011
I'm working through it slowly as an addition to my normal practice, and after several months I'm gaining the ability to know how to build extended and altered chords quickly - which notes to add or change to get to a M7th, 11th, 6add9, etc.