Fix stuff so that the Who's here list works.
Progress.