minor adjustments to finalize everything