added boxes, fixed clearing