Added some comments and some other things