removed outdated comments and added/removed fields