More work on the tracker implementation. Also made config handling more consistent