Finalized some things