Macro prop desks at GS

Is anyone familiar with the prop desks within FICC at GS? I know there is the global macro prop desk (i.e the desk formerly run by Christian Siva-Jothy), but are there others that focus on prop (not counting SSG or GSPS)?

Would the other "prop" activities be done by the same people who run the client business? For example, would the FX desk be taking risk in addition to executing customer flow? Hopefully there will be some knowledgeable people out there kind enough to reply. Thanks