More improvements + page break markers!!