removed bad sql.
fixed sql to only reference fn and ln
Merge pull request #1 from 365s1/master

Fixed a bunch of stuff including fn/ln.