more PANIC tweaks