Added comments, changed values, etc