Fix string grammar; re-arrange settings