fix width issue; complete cross-referencing