more fixes on markup