Pre-publication warning

+ tweaks