some minior tweaks, added tracker back in