Key changes, misc updates