Some Comment changes