Cleaned up grace_01 segment.
Improved makers.