Fix typos
Merge branch 'serverReview' into develop
Merge branch 'develop' of https://github.com/Trrnts/Trrnts into develop