more tweaks to be in line with new content