Fixed inconsistencies and out of date information
Merge pull request #2953 from jordanmkoncz/patch-1

Fixed inconsistencies and out of date information