More Toxy improvements and experiments