Work on comments and.update some methods