moved some boxes around, changed some text