Huge Update

Clean up code. Allow editing thread subscriptions.