Merge pull request #24 from genenettles2/master

new updates by Gene
fix db issues
Merge pull request #25 from richsalvucci/master

fix db issues
fixed all links