Add back in some removed options and a few new updates