Put boxes around everything, some other small changes