more article->content refactor
various refactors