Overhaul and shortening.

Subscriber stuff is untested as I don't have an account with access to this information.