Updating comments and global variables