Finalized some stuff