done through 1.3

finished through 1.3, some minor aesthetic changes.