more nightmare tweaks