Fixed 2 more bugs
Switching machines