The equipment basic fix has been done and is working AFAIK.
Please test, review, and tell me whether I can merge :)