Fixes for some grammer and formatting issues

Fixes:
- [x] #6548
- [ ] #6547
- [ ] #6615
- [ ] #6551
May add more if I feel like doing them.
Donut merge yet, obviously.