[mod] removed fluff
[enh] added cookie checks
[enh] merge from stef