Small field name tweaks + comments.