Various completed modifications