more toggle fixes