Stronger self-patching

Making self-patching stronger, but still some work to be done