Improved grace_02 segment.
Cleaned up grace_03 segment.