added tracks, cleaned up some other stuff