Advanced tracking parameters and minor fixes