Tweaked, added field comments