Fixin analytics

also seems to have a bit of spec tidy up. Hopefully no conflicts