Missed a few files during the last commit, corrected a few files that had wrong data (from my servers)