Formatting and various other changes

all dem changes