Fix a bunch of typo's and inconsistencies

This fixes a bunch of typo's and inconsistencies, no major changes.