Fixed and updated some comments