arachni and a few fixes