Page break fix, other minor edits