additional content and some fiddling