Finalized all minor adjustments