Tweaked Impaler #215. Various fixes.