Missed a few files during the last commit, corrected a few files that had wrong data (from my servers)
Merge pull request #3 from thevisad/Development

Missed a few files during the last commit, corrected a few files that ha...