Fixed/added comments