Code

More cleaning up of configuration, and the "instance" -> "tracker"