content, tweaks to #17