Update names and make some notes