more fixes and links.
Merge pull request #6 from stymy/master

more fixes and links.