patch loader more stable and other patch fixes