Make endpoint stuff configurable, fix topic, introduce what I think is a weird race condition, but it doesn't seem to be hurting anything, it is just silly.