Additional tweaks to comments and element attributes