Minor changes (mainly inline comments) to server