Add come comments
Minor fixes