a few more steps toward full formatting