Various Final Updates