Fixed/updated some comments