better fx
small speaker change
add in track states (public/private)
clean up styles
merge conflicts