Some modifications, filling out info.