Adding comments and pulling everything up to date.