Made rigorous modifications to Block, Point, Tray.