Updates, add names and comments