some improvements regarding contents