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

...d wrong data (from my servers)