Move an entry to the correct place. A couple of minor updates.