fixed little tracking issues