Updated segment initializers.
Added grace-agent segment.
Streamlined makers.