finalized some stuff