Limestone feature cleanup pass. Config added.

Not going to win awards for pretty but it's a LOT faster.