Plug in roster stuff

Bugfixes/cleanups whilst I'm at it too