Rewrite, clean up, speed up, etc

Major fixes, rewrite, speed up, less data for track id