toggle and speed fixes