last minute fixes and cleanup. added tracks