Witching Hour: bug fixes part 2!

Called the exterminator.