Typo/Consistency Fixes

I realized that you'd probably prefer that the pull request be targeted at the dev build. It doesn't appear that there's an easy way of switching the base branch, so I just created a new pull request.