more fixes and togglemak