Updated comments and a few names