Updating comments, shortening length fields