Bunch of changes - vi handicapped, so you're getting a short message.