major cleanup of output. updating to work with api client fields as pointers