Additonal commenting and modifications