fix some bugs, now tracking works again.
sorry i blew it.