Minor fixes per PR

Also, moving around a few strings to the appropriate sections