Fix up some patching bugs. Fully functional @ pre3
Pre4 update