Minor changes + setup publisher