Tracking works so far (few flaws still present).