tracking works a bit better now, but not perfectly.