Added some comments -Bug