clean up trackupstream filter
Fix typos
*sigh*