Merge pull request #1 from CleverRaven/master

PR to update my branch
Fixes typos and increases dispersion
Merge pull request #4688 from Zaweri/flint-fixes

Flint fixes