Another set of updates

revert some stuff lost in transition :-) - sorry this doesn't also fix the "blog markup" version.