featured articles support
some changes
conflicts fixed