cleanup + better autocompletes and subscriptions