some fixes, tracks ok now.