Several fixes according to drafting rules

File changed.

Preview size limit exceeded, changes collapsed.