Comment and code updates