Added some comments and some other stuff