more refactoring and adding :published to front matter