Set TRACKING_SIMPLE as default
Code tweaks
Code optimizations