Nearly finished with supplication fixes