Added some comments and all that good stuff