plugin/succubus: various improvements