equipment + bugs fixes