mason/infinite - some addl tuning