finalizing small changes