Fix copy-paste in -nw on darwin, clean up comments