Add some comments / made changes