Adding comments and fixes