Adding some comments etc