@aaronwoods_ @SpencerGatens_ made a few improvement!