Tinkering, not many changes while doing some testing.