Some fixes, but notably I have begun to make adjustments for supporting multiple publishers