Making topics work, some more changes