Some changes to the WAILA intergration, should be faster and more stable