Added a few comments and so