fix 'lead' bug and general clean up
Merge pull request #5 from beaurixon/master

Fixed a 'lead' bug and general clean up