finalized some things