more fixes for versification