Finalized/fixed remaining remaining elements.