added 2 more boxes, some fixes