Scratchtracker tweaks