fix tools & add Haiku thread