Adding a few comments here and there