BULLETS!! and other adjustments to the typopgraphy
merge conflict fixes