Added some comments and issues