some more fixes in several pages