Witching Hour: More bug fixes

squash.