comments, and modified some values