Formatting updates, adds pub & events