Added some more good comments