Add missing signup tracking data

And add level to subscription tracking data where appropriate.