Added a few comments and such