Issue #3 sorted out. Also moved some things around in tracker.