Finalizing some changes.